From b9d63db0bbcb90ac066740ad2926a69e2400a260 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Sun, 31 Dec 2006 04:14:28 +0000 Subject: [PATCH] Improve the docs of the "label" property. (#341730, Kristof Vansant) 2006-12-30 Matthias Clasen * gtk/gtkaction.c: Improve the docs of the "label" property. (#341730, Kristof Vansant) svn path=/trunk/; revision=16988 --- ChangeLog | 5 +++++ docs/reference/ChangeLog | 5 +++++ docs/reference/gtk/tmpl/gtkactiongroup.sgml | 3 ++- gtk/gtkaction.c | 8 ++++++++ 4 files changed, 20 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index df44c5fc2b..380cdd709e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2006-12-30 Matthias Clasen + + * gtk/gtkaction.c: Improve the docs of the "label" + property. (#341730, Kristof Vansant) + 2006-12-30 Matthias Clasen * gtk/gtkwindow.c (gtk_window_compute_configure_request_size): diff --git a/docs/reference/ChangeLog b/docs/reference/ChangeLog index 93be8c442e..5441be1507 100644 --- a/docs/reference/ChangeLog +++ b/docs/reference/ChangeLog @@ -1,3 +1,8 @@ +2006-12-30 Matthias Clasen + + * gtk/tmpl/gtkactiongroup.sgml: Document that action + labels may be NULL. + 2006-12-29 Matthias Clasen * gtk/gtk-sections.txt: Add gtk_cell_layout_get_cells. diff --git a/docs/reference/gtk/tmpl/gtkactiongroup.sgml b/docs/reference/gtk/tmpl/gtkactiongroup.sgml index 17fa43e940..8f363a0fed 100644 --- a/docs/reference/gtk/tmpl/gtkactiongroup.sgml +++ b/docs/reference/gtk/tmpl/gtkactiongroup.sgml @@ -203,7 +203,8 @@ gtk_action_group_add_actions() to construct actions. @stock_id: The stock id for the action, or the name of an icon from the icon theme. @label: The label for the action. This field should typically be marked for - translation, see gtk_action_group_set_translation_domain(). + translation, see gtk_action_group_set_translation_domain(). If @label + is %NULL, the label of the stock item with id @stock_id is used. @accelerator: The accelerator for the action, in the format understood by gtk_accelerator_parse(). @tooltip: The tooltip for the action. This field should typically be marked diff --git a/gtk/gtkaction.c b/gtk/gtkaction.c index 8c89b61138..5307363db2 100644 --- a/gtk/gtkaction.c +++ b/gtk/gtkaction.c @@ -193,6 +193,14 @@ gtk_action_class_init (GtkActionClass *klass) NULL, GTK_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY)); + + /** + * GtkAction:label: + * + * The label used for menu items and buttons that activate + * this action. If the label is %NULL, GTK+ uses the stock + * label specified via the stock-id property. + */ g_object_class_install_property (gobject_class, PROP_LABEL, g_param_spec_string ("label", -- 2.30.2